Squashing commits for ExplosionEvent pr