Merge "Separate proto message definitions for pushed and pulled atoms"