Merge "Add "enhanced metrics collection" support"