Merge latest changes from LX upstream