:)
done
Merge pull request #491 from eric-wu/develop

More StorageLocation cleanup and other misc changes
Merge pull request #490 from john-hill/eval-owner

Eval owner