fix #7522 - merge insights into main branch