Bug/1335 text changes