[#1273] Make sure new resource upload works, also fixes #994