Merge "Replace all keys in sendEids" into main