Remove relic from the past -- Related to #1222
Merge branch 'michel_1222_null_cursor' into next