Update to CR10
Merge pull request #310 from vhalbert/8.7.x

Update to CR10