merge in studio-1.2-release history after reset to studio-1.2-dev