Cmt
Merging into VisualStudio
Revert "Merging into VisualStudio"

This reverts commit d0808494da45d1966c66b740e7607b68530c44d6.
Merge remote-tracking branch 'origin/master' into development