Merge of etai and greg manually onto shappy branch