Revert "Merge branch 'master' into develop"

This reverts commit ae4157f89cf4e41a3e5ed89759df8aeb909afa00, reversing
changes made to cdf1c3f3186531a2324695911e30d8421614b8de.