- included changes from buildservice