[Bug 226223] New: Merge Review: ORBit2