Merge "Revert "Restore file truncation where expected."" into sc-dev