[Bug 225637] New: Merge Review: castor