Update master branch to version 2.5.2