Merge pull request #5234 from vkargov/vk-kiokunegi