Fixed Everything.
Merge branch 'Defect_19898_Upload_Out_Of_Bounds_Exception'