[TASK] Begin of fixing declaration errors of v6.2.x.