fix upgrade from silver to golden
Merge remote-tracking branch 'origin/master'