Build: #279 failed Changes by David Mehringer and Akeem Wells

Code commits

casa6