Merge "edit activity workflow plan for NS INIT"