Merge "Minor APM dump improvements, Part 2" into tm-dev