Merge branch 'expired-cursor' into 'master'

handle expired cursor

See merge request !148
27 jobs for master in 46 minutes and 3 seconds (queued for 9 seconds)