(360) Build changes