cherry-picked PR from RomNexus6 patch-38
Merge pull request #2661 from marco-jacob/pickedItPR

cherry-picked PR from RomNexus6 patch-38