Upgrade to 2.4.1
PR: 218868 Reported by: i.dani@outlook.com Approved by: maintainer timeout (14 days)