update merge r115:HEAD changes