Merge "Backward-compatibility max file size support, ignoring 0 or negative file size limit"