ECMS-4880: Fix on rest service