Fixes #4135
There also is a respective af3 branch 4135 that can be used to test and also shall be merged.