Merge "Adjust the process group of the phantom processes as well" into main