Fixed conflicts relating to Hover Issue merge