[TASK] Add missing changes due to wrong merge ...