allocate change2
Merge origin/master