WP-2906: add comma separation.