Merge "Minor APM dump improvements" into tm-dev