Merge branch 'dm/cherry-pick-s'