Temp
Merge remote-tracking branch 'origin/dgud/vip/wx-hacks' into dgud/vip/wx-hacks
More Dialog fixes temp