Patches for changed output to match dev guidelines [sf#1285165] [#504]