Merge branch 'rs/simplify-transport-get'