[6.x.x] Stabilise Build#118

adamretter merged 2 commits intodevelop-6.x.xevolvedbinary/elemental:develop-6.x.xfrom

6.x.x/hotfix/stabilise-buildevolvedbinary/elemental:6.x.x/hotfix/stabilise-buildCopy head branch name to clipboard