Merge branch 'v2-suggestions' into 'develop'