Merge branch 'MDL-78447-tool-generator-progress' of https://github.com/brendanheywood...