changes based on release feedback
Merge branch 'release/v1' into develop