Merge branch 'jt/avoid-ls-refs'