[#335] use smartFormat() everywhere
Merge branch 'current' into develop