Pull 1024-cpu into release branch