Merge branch 'jt/namespaced-ls-refs-fix'