merged documentation fix from RC_0_16