simple repairs
Merge branch 'temp' into develop
Merge branch 'develop'