Merge pull request #6632 from t-8ch/esniper_2.35