update fixes
removed exception in generic
Merge branch 'develop'