[merge] backport stable into default [in-progress]