[OE-3700] merged in latest changes from develop branch