<!-- This is not an exhaustive model but a help. No step is mandatory. --> **Description** Backport #815 to `v1.x` branch