[Bug 225637] Merge Review: castor