Merging bugs affecting all the platforms