Merged features/inband -r4812:5218 into trunk. This group of changes