v3.0.2
Merged PR 1532: cloned from https://github.com/microsoft/UFO/tree/vyokky/dev
Merge GitHub changes up to 3e8b986