Merge the upload fix into develop-ak