U4-4931 - lock contention & potential application lockdown

See details in issue tracker.