Merge changes  into lk.lnx.1.0