Backport changes from the newer upstream version

This is a backport of upstream changes for T7478, so that a no-change upload should not create a new revision (which breaks the obs-monitoring job in the packaging pipeline).

This is the forward port of !3 (merged).