Merge "Upgrade-check id controller is enabled"