Merge "Improve the UX around sample config generation"