Merging with Ryan's except MapGuideView