merge of feature-new-games