Merge "L5 Metrics Addition:" into qt-qpr1-dev