Merge updates from Xylon and make it work on Endeavoru