Merge branch 'rl/show-empty-prefix' into maint