Cherry pick bugfix set local in rebuild cache
Merge chiba 2