Sync versions with 2.x branch.
Fixed 3176094 and 3155697.
Adding test
Drupal 9 readiness
2 bugfixes.
2 issues fixed.