This fixes ninja builds
enabled an automatic merge when all merge checks for cfab4a0d pass
merged
mentioned in commit 65814a11