Revert "Merging development branch"

This reverts commit 54812cd8e33a909d270fd25bfb581353740f980c.