Merge branch 'staging' into i-2053
2053: updated error message for invalid file size
Merge branch 'i-2053' into staging