Merge part of 'sp/checkout'