Merge "RESTRICT AUTOMERGE: Disable file compaction by default" into tm-qpr-dev