[Feature Request] Update the logic to handle mtls flow

[Feature Request] Update the logic to handle mtls flow #532