merge master into no-backgroundjobs-during-upgrade