Merge branch 'lt/config'