Merge tag 'v1.2' into develop

jsonfix
code standard
Merge branch 'release/v1.3'