Updated for release 3.5.6.1696