GBE-431 Shapefile upload doesn't work correctly in deskmanager
Merge branch 'GBE-431' into magdageo-2.4.0-M1