Merge branch 'wb/midx-progress'