[MERGE] fix a dependence in portal and reorganize xml