Merging recent changes so more work can be done on the Angular branch