MERGE: Merge branch '6.1' into 6.2
MERGE: Merge branch '6.1' into 6.2

Also replicates https://github.com/neos/flow-development-collection/pull/1949
correctly (i.e. in neos/flow itself.)

neos/flow,neos/flow,neos/flow,neos/flow