Merge in updates by michaelfung

### Test pull request to merge in updates from a fork