Bring Experimental graphics branch inline with master

Test PR only, Im not sure if this is best way to do this, without undoing gfx changes.