Expose privates in a different way.
Display style does not have to be at the end.
Merge branch 't/10830' into major