Merge branch 'ls/config-origin'