Thank you for the speedy turnaround!
I propose to go ahead and merge this after I've addressed Russell's requests. That'll mean generating a lot of warnings until
DM-11558 merges, but I think that's something we can live with. jsick, rowen – please let me know if you're not happy with that.