#CEXT-69 comment -
#CEXT-80 comment - fix
merged and modified #CEXT-59