TD-3806 (All unit tests need to pass) II