Replace Mms fix by merge request