Merge branch 'ab/unbundle-progress'