Merge for Phase 1
Updated doc