Build: #313 failed Changes by Bob Garwood and Akeem Wells

Code commits

casa6