Disabled (to be removed after a while) output cache handling
Merging with master
Typo fixed
Merge branch 'master' into rover-msp