Wip 3436 2.1 √

Backport of 3436