[ENTESB-674]sync up KARAF-1951