#25025 moved functions to custom menu