GPII-321: conflictless copy of https://github.com/GPII/universal/pull/176