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

Change-Id: Iaaa9b2ee3ee3abd3cf4346f841958e6e08f8fcba