Merge branch 'MDL-54119-master-with_progress_bar_template' of git://github.com/junpat...