merge r67228-r67235, r67237, r67251 and r67256-67259 to trunk (they are