Merge changes for upstream ae.