cherry pick about us fixes