merging for m4 release