Help the cherry-pick for TRQ-2347's original fix.
Help the cherry-pick for TRQ-2347's unit test.