Fixed a few things and published
Bumped version
Merge branch 'hotfix-1.6.30'