Merge branch 'sp/checkout' into next