Feature/merge from 9.next to 10.next #236

Job	Run time
Coding Standard & Static Analysis	29s
testsuite (8.1, sqlite)	19s
testsuite (8.2, mysql)	18s
testsuite (8.1, pgsql)	21s
testsuite (8.1, mysql)	17s
testsuite (8.3, sqlite)	13s
testsuite (8.2, pgsql)	22s
testsuite (8.2, sqlite)	17s
testsuite (8.3, pgsql)	20s
testsuite (8.4, sqlite)	17s
testsuite (8.3, mysql)	20s
testsuite (8.4, pgsql)	24s
testsuite (8.4, mysql)	30s
	4m 27s

Provide feedback