Merge branch 'hotfix/0.5.5'
More time to use caching in memcached
Merge branch 'hotfix/0.5.6' into develop