Merge pull request #4333 from ymln/bliptv-fixes