Merge "Allow the kernel to upgrade ASYNC mode processes to SYNC mode." into sc-dev