WP-3569 Moved from code from ct to display