#23976 - Added configuration option to be able to expand items when only
a single item for an output
Merge branch 'master' into perforce