Merge branch 'ls/p4-keep-empty-commits' into maint