[OE-4014] Fixed stickyelements
Merge branch 'release/1.6' into develop