LAMBDA-36 + LAMBDA-38: fix upload