Upstream to 3.0.97
Merge pureCM