Timeout was removed for cache locks to avoid system crash in case of massive swap usage.
Merge remote-tracking branch 'origin/develop' into develop