Merge branch 'm4-update'