re #9673 added file include, improved output