merge in studio-1.0-release history after reset to 2ff76ae4a8fc1037d2e35f1c741ab3ed0187f273