Public upload case. Fixes #1254