Add a third device to non-accelerated list (#2803)
Merge branch 'release' into upstream