[7.x.x] Stabilise Build#117

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

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