Merge "Merge branch 'LA.HB.1.3.9_1' into display.lnx.3.0-dev"