Xlabs2 merge