Changes since tagged release 7.x-1.5:
drupal9 ready
This will be our 9.x compatible branch.
Addresses the following issues: