Merge "Revert "Reduce locking in JLookup"" into ub-jack