scram-project-build: sync changes from 72x/71X in to 70X