partial commit for merged changes from philchuang