Apply m4 patch

milestone4