Merge branch 'lt/fix-config' into lt/config