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