Merge "Add remote_ip_prefix to tests in case of TF" into mcp/caracal