case 2305 - Change date format.
Merge branch 'case-2305' into develop