#25025 moved to custom menu