SPD-2 Commit to fix major issues (13) that break build