Merge branch 'ts/checkout-advice-plural'