Merge branch 'jc/lt-ref2-with-lt-refs' into jc/ref-locking