Merge the updates

All conflicts were resolved properly.