Merge "L5 Metrics Addition:"