Before merging development and master branch