This commit concern task XWR-61
Merge branch 'mouhb-task_reporter_XWR-61'