Pull request for all the remaining patches, including the new performance monitors.

True. It's best to deprecate it for now.