GPU: Backport from caf-jb_2.5.5