SYN-187: Set a more sensible default for the content_addr
Merge branch 'master' into develop