Port m16 delta changes to m18

This reverts commit 1d114289.

Merge request reports

Loading