Merge "Fix up replica/pos logging"