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