Merge M4 commits into master

Tested and should be working