This should finally unblock upgrading SQLite per se to latest release once the builders are happy with this commit.