params cleanup
version bump
Merge branch 'edge'