Backport/508

Backport of #508 into the 3.0.x-juno branch.