Merge pull request #4327 from vkargov/vk-abcremedy