imported rake change from master branch, re packed workflow