Thor generator update and post
Merge branch 'develop'