Merge "Fix bucket change issues." into tm-dev