Thanks Thomas, for pointing them out!
(cherry picked from commit 15eeddb2)
Patch got lost during transition next -> master.