#CEXT-261  #CEXT-269 #fixed  + #fixes