GPII-308: Review 2 equivalent of https://github.com/GPII/linux/pull/37