Merge branch 'master' into develop
case 2305 - Change date format.
Merge branch 'case-2305' into develop
Merge remote-tracking branch 'origin/develop'