WP-2956: add comma separation.