Merge "Revert "Get OperationType from transport"" into sc-dev