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

Change-Id: I40f8fcf5596901dd6311456f34727aaa9dc29a86