Merge branch '559-disable-ddoc-cache'