Merge "Refactor CLM jobs for AAI"