Merge "Check if user is unlocked when handler is executed" into nyc-dev