Follow-up of d97cce3409 and 7d3fe36c62. Backport of 35319bf12c from master
d97cce3409
7d3fe36c62
35319bf12c