[AC21.5R21.4] Draft fix for metacity maximization bug