Revert "Merge master with development branch"

This reverts commit 46dcdf1fce168698ad770b3379a8fdcf20e6d389, reversing
changes made to 4b2268ee65ed9c3d3d047d2c46bf0fcaa8bf1340.