Backport 1661 fix for 3.x

[neuwerk]

It would be nice to be able to cherry-pick the commit for #1661 and a backport for 3.x.

But there seems to be no viable 3.x branch to commit to. The last release,3.0.2-RI, says:
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Is there a branch that this commit can be backported to? If not, can one be created, so that the commit can be backported?