Merge remote branch 'blipvert/fixes'