WP-2622: updated display suite.