Remove spirous call.
Merge branch 'master' into data-caching