Merge "Fix AssembleUploadChunksJob/PublishStashedFileJob IDEA errors"