#12434 Adds some new lines
Merge remote-tracking branch 'origin/master' into david.price