attempt to fix reflection issues
Merge branch 'develop'