Merge branch 'master' into virtualize_output enabling parallel calculation sorting and result flushing