changes for alias not checked in, from the git merge with jumbo