Merge branch 'bigpredidata_improvements' into 'dev-test_bigpredidata'

Improvements for bigpredidata branch

See merge request !194
in 7 minutes and 15 seconds, using 0 compute credits, and was queued for 3 minutes and 24 seconds