Revert "Merge branch 'develop' (reverted from commit 75c1d753710a1e3fe54c1ce370622409a96992b8)"

This reverts commit b11334d1dde32c3e25795e142a728d7c620767bd.