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