LAMBDA-36 + LAMBDA-38: fix upload
Merge branch 'master' into theradiocc