Fix NPE in AlertPatch
Merge branch '1.0.x' into experimental