Studio 2.2 Preview 3
merge in studio-2.2-release history after reset to studio-master-dev