Pull fix-cpu-possible-map into release branch