core-4680 make simple uploads non modal
Merge branch 'master' into STABLE