Merge RIP part of 6Wind patch.
7 files changed