[JBJCA-1127] Minimize locking duration on cls