unified patch file for core changes based on dev rev 2875
also changes made to graphics in prep for genericization