cherry-picked PR from RomNexus6 patch-38