Merge branch 'sr/local-config'