Merge branch 'jc/attributes-checkout'