Fixes 2533132
2533132 - Build files