PIM-1955 : replace custom logic by dedicated method call