version 1.0.2 (SI-7710 fix)
Merge branch 'release/1.0.2'