Merged sqlite-trials work to v1.55