Update for merge to Hercules/skyrocket