Merge "Remove the tentative FGS logic" into udc-dev