Merging changes from work machine (should be minor stuff)