Merge "remove out-of-process flag"