merged fix from RC_0_16