Merge branch 'fix-infinite-cake-prefix'