Merge "[wf]Initial Changes for "together" extend"