Re-add accidentally removed upstream dev updates.