Track suggestion from #367 in roadmap