CAL-821 wrong message because of merge stabilization