ENTESB-1182 + version alignment