generalized string-based locking and used it also in ldcache
Merge remote-tracking branch 'origin/develop' into develop