Merge branch 'dev' into k40_flow_cooler