Patch 2/3 rebased to M36