Merge branch 'tb/test-lint-sed-options'