Update to g20200415
PR: 245762 Submitted by: ezri.mudde@dutchsec.com Approved by: remco.verhoef@dutchsec.com (maintainer timeout, >3 weeks),
ehaupt (mentor)