* commit '8c403f56cdf9bd0251ef9fefebbe002e09efe740': Fix issue where unlock handlers are not properly updated