Merge pull request #3174 from castillofrancodamian/dcwapd