Build: #33 failed Changes by Bob Garwood and Ville Suoranta

Code commits

Casa6

OPEN-CASA-PKG