Ultra optimization of code responsible for the -dc configuration option.
Merge remote-tracking branch 'origin/master'