Update dcap backporting from 7_2_X.