Issue #2271229 , #2820380 by haleagar, ChaseOnTheWeb: File replace no longer preserves original filename