- merge latest changes of phase I