Merged with mine and Venkats changes