Merge studio changes in