Merge pull request #12907 from civicrm/5.7