Help along the cherry pick of my revision for TRQ-2058.