Updated notes caching to be able to override the default timeout.
Merge remote-tracking branch 'origin/develop' into develop