Reducing differences between master and devel branch