Build: #538 failed Scheduled with changes by George Moellenbrock and Hendrik Muller

Code commits

Casa6