Duplicates pull 250 on universal

Duplicates https://github.com/GPII/universal/pull/250 to universal.