Cross merge MSI Upgrade for 0.7.3 #2927