Merge "Rework build to move the parent out"