Merge "Ensure partition_tag is always set correctly"