Merge "Update test-lint-baseline with new checks from S"