Merge "Set transport types to resolver" into rvc-dev