Attempt at fixing CI/CD

Shaun Wu requested to merge master into release-desktop Nov 18, 2020