Merge with Angular version up