Reduce differences compared to master branch