trying to reproduce #1598
version bump
updated dependencies
merged with 2.0