merged documentation fix from RC_0_16
erge documentation fix from RC_0_16