Preparation for merge to master