#DGTF-920 update
merge 2.2i5 to qa-sprint