Merge branch '2.3.x' into 3.0.x #1507

Job	Run time
mariadb (locked, 8.3, ubuntu-latest, 10.4)	1m 22s
mariadb (locked, 8.3, ubuntu-latest, 10.6)	1m 21s
mariadb (locked, 8.3, ubuntu-latest, 10.11)	1m 24s
mariadb (locked, 8.3, ubuntu-latest, 11.2)	51s
mysql (locked, 8.3, ubuntu-latest, 5.7)	59s
Postgres (locked, 8.3, ubuntu-latest, 12.17)	53s
mysql (locked, 8.3, ubuntu-latest, 8.0)	57s
Postgres (locked, 8.3, ubuntu-latest, 13.13)	1m 29s
Postgres (locked, 8.3, ubuntu-latest, 14.10)	57s
mysql (locked, 8.3, ubuntu-latest, 8.2)	55s
Postgres (locked, 8.3, ubuntu-latest, 15.5)	1m 18s
Postgres (locked, 8.3, ubuntu-latest, 16.1)	1m 19s
Sqlite (locked, 8.3, ubuntu-latest)	11s
	13m 56s

Provide feedback