Merge branch 'develop' into lbudginas/#637_update_coin_naming