case 2471 - Fixed error regarding formatsAvailable not defined.
Merge branch 'case-2471' into develop