MoMMI Spaghetti fix

Created by: coldcola

I had another implementation of this recommended to me but I couldn't get it working properly, this seems to work and not break anything though.

this also adds changelog update missing for #12181 - I guess I fucked something up.

this closes #11248 (closed)