merge in studio-1.4-release history after reset to studio-master-dev