No response yet, so just thought I’d try posting here again. Do any core developers who may be reading this have any suggestions? Would love to try to address any review feedback before having to fix (another round of) merge conflicts. (And ideally maybe even get this landed in time for the 3.10 feature freeze in early May?) Thanks in advance for any help here.