More for ITS#9275 and term cleanup

Merge request reports