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

Change-Id: I5e96fa80bf2a5fcdb382b39ec67a013eae0d95b7