Merge changes that existed in branch concerning slicefamily w/ trunk.