Merge change 3795 into donut

* changes:
  URI/extra data for inline scheme.