US535 - refactor the way additional info is output
Merge branch 'development' into development-work