This is resolved by the changes in [65f84287e754ff50]. In addition, the -validatecommand option also allows for the user to check and validate the peer's servername too.