Merge pull request #1470 from bug-or-feature/feature-1421-better-build

Merge pull request #1470 from bug-or-feature/feature-1421-better-build #1041