More reconcile-visit bug squashing.
Merge commit 'b415f6c1b0a26718f5689f33cc166aada5084804' into next