enable feature fork
Merge remote-tracking branch 'origin/master' into fork
Merge pull request #790 from kostya/fork

enable feature fork