merge stable branch into dev branch