Google Chrome fix
Merge solved
Merging