Updating or removing menus following what decrypted in the following JIRAs: ATR-25727 ATR-25764 ATR-25769 ATR-25775