Merge branch 'sp/merge' (early part)