r197: mistaken merge from trunk