fix typo
merge stable into default