[Bug 226223] Merge Review: ORBit2