Merge big decimal type error fix to 1.7