Merge branch 'type_boundary' into 'master'

Use int64 for indexing

See merge request !251
16 jobs for master in 31 minutes and 24 seconds (queued for 5 seconds)