Merge "Add aliases for -nodeps targets" into main