Merge remote-tracking branch 'origin/atel-sys.lnx.13.0' into HEAD

Upmerge till:
  commit <6855602e8513feb6d5636262cd54a771689d25aa >

Change-Id: I90334d7f0b7ad8cbc3fb0cf633e0d935f6f5d532