latest version from test
updates for funder and context
Added Persistent flag for queries; added cache clean up after migrate
new code for stats generation