Merge pull request #9696 from MrPetovan/bug/9306-poke-privacy