Merge branch 'release/v1.2'
Merge tag 'v1.2' into develop

jsonfix