Patch with fix for TDS-466 (tests and such are on target-4.4.0).