upstream master into cloud4e