Test fixes
Merge fixes
Merge remote-tracking branch 'origin/angular' into angular