Merge changes from cgwpope branch