I'm marking this as resolved since I think the answer is useful. Feel free to share more comments / reopen etc. Thank you!
This refs T15106 and presumably resolved by D25052