EJPLUGIN-165: added FX changes