Merged graphics, network, and master into master