Merge pull request #19979 from civicrm/5.36