Merge branch 'trailm' into trial_fixMakeCDSDBRefPropagation