M4 breaking changes

update from breaking m4 changes.