Merge pull request #1987 from rzhxeo/blip