Merge branch 'bp/refresh-cache-ent-rehash-fix'