Merge New Graphics Branch into Master Branch