Preparations to merge into master branch