changes for trunk3987