Merge "Bug fix for crashing FGS type logger" into udc-dev