Create sanity resource objects dynamically, merge f885aa9 from master