#535 delta import

Closes #535

Merged commits from previous pull requests,