add comments to M204
Merge remote-tracking branch 'upstream/edge' into edge