Additional metrics
Merge commit '86060ac4d54137792524c7bf664feda4cf18b298'