+PATCH-1121, +PATCH-1123, PATCH-649