Update 994263
R+ 994263
WAE Graph patches