Removed component helper...
Bumped version/changelog
Merge branch 'release-3.1.7' into develop