Merge pull request #10197 from tiagogaspar8/kea-1.6.0