Merge "Update buckets after path changes." into jb-mr1-dev