Merge branch 'sb/push-options-via-transport'