Merge to Update 40