+PATCH-1103, +PATCH-1104, -PATCH-879, -PATCH-658