Merge remote-tracking branch 'rzhxeo/blip'