bug869897: First pass of changes