Merge remote-tracking branch 'origin/faster-continuous-data-split' into faster-continuous-data-split # Conflicts: # src/helpers.cpp