Merge branch 'jk/checkout-attribute-lookup' into next