Merge lastest official update
Merge all