Merge branches 'redomasks' and 'generatebiome' into develop