Fix visuals an events (cherry picked from commit c5fa08afc1d1b33b95f4e469431e25c8e782b16c)
2cf397c265