Merged r11500:11506 from features/msg-passing into trunk. Work-in-progress, passes...