MIFOSX-117: integrate andreas work on UGD.