Build: #349 failed Changes by Bob Garwood

Code commits

casa6