PR Close #32563
PR Close #31284
Followup to https://github.com/angular/angular-cli/pull/13700 PR Close #29633