GPII-308: Review2 equivalent of https://github.com/GPII/universal/pull/162/files

Review2 equivalent of https://github.com/GPII/universal/pull/162/files