Merge branch 'release/1.1.20' into dev
same update as cortana base
last fix
bump version
Merge branch 'release/1.2.0'