This merge request fixes an issue with both database and protocol template which cannot be forked.
Part of #60