Backport a fix to 9.2 for conflict resolution