Merge branch 'la/diff-relative-config'