Merge branch 'master' into develop
case 2471 - Fixed error regarding formatsAvailable not defined.
Merge branch 'case-2471' into develop
Merge remote-tracking branch 'origin/develop'