new PDO patch, almost upstreamable, add patch to add more contact info support in SP metadata