S4-127 fix format string
Merge branch 'S4-127' into dev (take 2)
- second merge to include left-over modification in S4-127