Merge "Fix key upgrade on begin"