changes for release 3.6