Cherry pick 'remove-snapshot-dependencies' into 'release/0.7'

David Diederichrequested to merge
cherry-pick-7137a00c into release/0.7

See merge request !129 (merged)

Merge request reports