[Bug 984315] Merge fix