Merge branch 'sp/checkout'