Merge branch 'main' into evis/ent-1130-code-search-improve-readability-of-terminal