[OE-5113] - Merge branch 'master' into develop