Merge "Fix a wp<> bug where the owner ID would be wrong"