initial commit of bug id 1374435