escape (15.1.2.4) and decode (15.1.2.5) were moved into 15.1.3