Syncup mainline with changes from xvisor-next tree