Re-resubmission lost in !517 (merged) Now that the pipeline is green, this one should work at last :-)