No functionnal changes are done in this commit. Everything stays the same, but use the parent mixin mecanism. Task-1903565
84500c27b1