Merge pull request #16296 from stintel/kea