maintenance update: finished
Merge branch 'release/1.10.2' into prod