Merge v2.3.19 from Chrome Web Store