synchronize integration and master branch

synchronize integration and master