These aren't truly build dependencies, go back to the old way
Merge branch 'develop' into release_branches/1.0.3