Update dcap backporting from 7_2_X.
Merge pull request #872 from degano/dcap_62X

Update dcap backporting from 7_2_X.