case 2453 - Display refactor.
case 2453 - Revised code comments.
Merge branch 'case-2453' into development