Revert "Merged current development branch to master"

This reverts commit 29ea5ca8abce362e8f208ef7ea4bf8731e1cfecb.