Merge "Rebase vsperf to stable/danube" into stable/danube