Merging master and Scale Builder, second attempt