Revert "Revert "GPU: merge with CAF kk_3.5""

This reverts commit e03144693c4eb3c137faff00aa0632b858321b99.