Feature/backport 3310250