Help the cherry-pick of TRQ-2377.