Merge "Don't fork USAPs with open argument buffer"