Fixing implicit numeric widening
Merge branch 'topic/implicit-numeric-widening' into develop