TRQ-2910 refactor of MOM hierarchy handling.