Merge "Use tmpArgBuffer correctly when argBuffer is null"