Merge pull request #10113 from knoopx/improve-custom-builds