Patch looks good. Unfortunately, I wasn't been able to validate it is working as expected because I can't compile gridmix on my system as it aborts on some generics complication issues.
According to a multiple confirmations from other ppl. looks like that the patch actually fixes the problem in some production environments. So, I am committing this with an official