Merge branch 'rs/checkout-some-states-are-const' into maint