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