const_cast, static_cast
Merge branch 'develop'