This is fixed in the s22-qatar branch, on this commit:
ede071f
You probably just need to cherry pick this to the master branch. I could not find an easy way to create a pull request with only one commit (apart from creating another branch, etc, etc).