case 3083 - Reverted toggle format.
Merge branch 'master' into easy
Merge remote-tracking branch 'origin/case-3083' into easy
Merge remote-tracking branch 'origin/easy'