This MR contains general improvements and new components that are required for the new Upload process