Merged latest changes from work machine