+PATCH-1133, PATCH-936, PATCH-794