Build and stage cleanup
Merge branch 'f/mac-deploy' into develop