v1.2.0
a53f1370 · Merge branch 'ee-6797' into 'master' ·