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