Backport upstream commit a7f617ab3328153939cb757a5cf9001071ef8720 PR: 280435 Approved by: kwf@nanoteq.com (maintainer)