Merge "Fix for compaction vma batch not consuming after first send" into tm-qpr-dev