Support ForceUpgrade parameter
Apply CR
Merge pull request #2134 from ogail/1746

Support ForceUpgrade parameter