Merge branch 'anandpdoshi-file-fix' into develop