BZ-12704 text and link changes