Issue #22544:change condition when unlock performed