Be robust against the upstream fix.
Merge topic 'generate-qch-doc' into next

cf66de4e Be robust against the upstream fix.