Merge 2 pr for find thoughts together for easier follow up #269

Closed benbackend closed 1 year ago