I don't remembe if both are needed. I added it at some point during the migration. I can try without the assets when I fix the merge issue.