There are a error in Quick unlock that I donn't understant, for this reason
I have deleted de conflictive part.
I will revert the commit and try with another commit