Closed gniezen closed 3 weeks ago
Addresses UPLOAD-1295.
This work should not be merged before #1639, as it has been merged into this PR>
Addresses UPLOAD-1295.