bc44569 partial reverted, for a merge request, focused on COT refactoring