Merge "Ensure github change body is not a NoneType" into feature/zuulv3