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

Build-Utils improvements (maintenance)