Merge "Refactor the flow for Controller as Initiator."