Merge branch 'kalkyl_test_config' into qc_pipeline_devel