Merge "LCE feature enhancement" into m-wireless-dev