EJPLUGIN-165: added TAbris changes