Build: #418 failed Scheduled with changes by George Moellenbrock and Takeshi Nakazato

Code commits

Casa6