Merge pull request #2949 from valentinewallace/2024-03-dont-write-empty-features