Merge pull request #3058 from ewsi/feature_dcwifi