Issue #22544:change condition when unlock performed
Merge pull request #279 from garyhgohoos/22544-2

Issue #22544:change condition when unlock performed