WP-1828 Text and link changes