EJPLUGIN-165: added core changes