BigDecimal mapping
Merge branch 'feature-bigdecimal' into develop