Performance improvements
Merge branch 'v10' of github.com:chrisgraham/ocPortal into v10