[OE-3856] bugfixes after merging from develop and release/1.5