+PATCH-1132, +PATCH-1121, PATCH-649