Use combined with #3358781 already included in dev version when using current stable version 8.x-1.3
Closes #3471159