r27120 - refactor: modifiers changes by @midgleyc in

Top