merge in studio-1.0-release history after reset to a200acb12ec8d97fc918423ee142cdf728325b10