Clean up resolve_supported_languages_using_cli FF
#3224
Merged
resolve_supported_languages_using_cli FF
#3224