Merge branch 'master' into #376
test_des_meds assert number of objects and cutouts
(#376)