First try was way to simple on the approach
Merge pull request #2905 from noctarius/build-utils-fix

Build-Utils improvements (master)