Merge pull request #4198 from vkargov/vk-prevbb