Merge "Improve anti-staging checker."