BZ-12101 and BZ-12102: Text changes