Build «feature/2683-minor-hashmap-cache-improvements» (t-b)

Build «feature/2683-minor-hashmap-cache-improvements» (t-b) #2589