Merge "FGS stop log bug fix" into udc-qpr-dev