ported changes to M2S 4.2