Adapt master branch to the official branch