fix merge conflict
Merge branch 'dev' into feature-abstract_game_bundle