sync with mainstream, but check more
1 file changed