Merge 2

Still need to convert tables, fix xap96 and xap97 other space url, and finally recheck all once again.