Patch J for KAVKISKTSKFA 2018
I think that this will be a separate patch.
So, you plan to add support for RS5 in next patch. This is kind of less-urgent patch to fix hot issue.
How about 2019 patch C? Looks like there will be much more fixs in patch than in patch J.