Merge branch 'kb/hashmap-v5-minimal' into kb/fscache-v4-t1.8.5