Merge "Correct flow for ScaleOut"