[Multibuttonentry] opensource merge (r73223)