Merge branch 'ps3-queue-v4.18'