Merge Xstatic branch