WP-2167: add prefix and suffix.