Merge "[Catalyst] Refactor some Text Reading items" into main