CiviCRM 5.35 compatibility