GPU: Update from JB_2.5.6