Merge changes  into display.lnx.5.0