FLEX-34501 add support for 3rd party components