Very good. So, shall we create a JIRA to kill the two birds with one pull? :)

I am saying this, because it looks like both instances require webflow mods that would not be so trivial to make.