Build: #817 failed Changes by David Butt