Merge "Add null checks for ConcurrentHashmap queries" into sc-v2-dev