Added support to suppress_name_id_policy