Add missing handle_legacy_interface()
calls
#6565
Merged
handle_legacy_interface()
calls
#6565