Merge pull request #449 from jkczyz/2020-01-remove-borrow-parts