Merge branch 'master' into sta
Set database to objects retrieved from the cache.
Merge branch 'master' into dev-cleanup