Merge branch 'sv/checkout'