sync with devel/master branch