Merge "Align CI/CD jobs with code refactoring."