Merge "Store as V1.0 reference by default"