case 3083 - Reverted toggle format.
Merge branch 'case-3083' into develop