Tested this fix in on latest master, in conjunction with bug 1796971 and it seems to address the issue(s).
Tested this fix in on latest master, in conjunction with bug 1796971 and it seems to address the issue(s).