#CEXT-16  fixes