The changes of Patineta kills mine changes, reuplo
Merged Patineta changes with mine changes on flags