Merge remote-tracking branch 'meskio/feature/cache_invalidation' into develop