Merge "this change mainly updating project code"