merge stable to work branch