merged fix from RC_0_16
merged fix from RC_0_16