Changes and addition in menu as requested in ATR-25657
This is a continuation of MR !53985 (closed) (related jira ATR-25657) which is already approved but needed manual squash of commits. Adding @khoo , @sshaw
This is a continuation of MR !53985 (closed) (related jira ATR-25657) which is already approved but needed manual squash of commits. Adding @khoo , @sshaw