Start fixing timeouts by using set statement_timeout
Merge branch 'timeouts' into devel