EJPLUGIN-165: added RAP changes