Sync with master (versions resource changes)
Merge pull request #685 from chadlung/verify-resource

Sync with master (versions resource changes)