Merge branch 'cc/test-ref-store-typofix'