GPII-89_GPII-72

This pull contains the changes from https://github.com/GPII/universal/pull/76 but rebased on top of current master