#CEXT-236 flamp fixed
#CEXT-216 #FIXED
#CEXT-236 some fixes