Merge branch '81552433qqcom-master' into develop