Merge "FRR - Stop collecting data" into udc-qpr-dev