Update File.php
Merge branch 'hotfix/1.2.4'