initial tailoring for release 3.9