Initial step in removing NeedsBuilding and related API
Merge branch 'master' into nobuildcheck