Merge "BUG-868: migrate InstanceIdentifer.builder() users"