Merge lynix's latest changes