Merge latest code changes from Trenta OS team