This has follow-up commits for consumers. While here, adjust my hat a bit and give the port to kde@ PR: 284858