v2.4 text changes carrying over from v2.6 ticket