Formatting
Partial fix for supportting VGA
Merge remote-tracking branch 'origin/master'
Revert "Confilct"

This reverts commit e779db86570734557c5c482b76014e1bbf3594ac.