Merge branch 'fix_warnings' into branch_v2.0