Merge "Resend remaining VMAs on partial compaction due to failure" into tm-dev