Manually merged minor changed by ltrebing.