Merge branch 'custom-games'