TUP-2107 Refactor Updates

About the refactor updates, need merge and validate to master.

After checked, can't move this job to EE. but I removed the P2 relation.