add hidden cast
Merge branch 'develop'