Merge branch 'master' into 'uiv2'

# Conflicts:
#   src/Token/Token.csproj
2 jobs for uiv2 in 36 seconds (queued for 1 second)