U4-4931 - 7.1 - lock contention & potential application lockdown

This is #418 for 7.1