Revert "Merge branch 'master' into Development"

This reverts commit 4554172a259e319ed2ca7fe795f8fcf754a6af63, reversing
changes made to 9ddfdd9d355fcca90c520548119681de36df516f.