[#67221996] Restored old menu container code