Merge branch 'mh/transport-capabilities'