Merge branches 'lt/crlf' and 'jc/apply-config'