Merge "Restore I/O priority support" into main