reintegrate release branch rb2.3 into master