Merge tigrc from work