cubicweb #13861544 backport 3.21 changes [validation pending]

backport 3.21 changes

prioritynormal
typetask
done in3.23.0
load left0.000
closed by<not specified>
patchbackport 3.21 changes [applied]