Merge "Fork: Limit async upload memory to 6MB" into lmp-dev