merge stable

merge stable