This P10 is to be solved in a next PR, once this gets consolidate in the feature/322.