Put recent changes from pc-updatemanager into 9.1-release branch