12.0 fix dismiss ts

Merged Gastón Bertolani requested to merge 12.0-fix-dismiss-ts into 12.0-stage

Merge request reports