Merge "Fix daily test default capm3 branches"