Merge branch 'jc/cherry-pick' (early part)