Nova-Committee/Maced

A backport for the mace item

NOASSERTION