Added 'microsoft' name when Microsoft is a partner
Merge
Fixed a bug in variable name
Added partner name when partner is microsoft