Merge stable changes from in-progress