Modify CM margin (to rever later)

Fixes #3397, should also be reverted when closed by #3391
Cf #3358 also