Fix merge of new changes behaviors