Remove implicit cast
Merge branch 'implicit-cast'