Merge "fix clm job critical issues"