>Can you cherry pick the appropriate commits for the migration >into the site branch?
What do you mean by that? Can we just revert the invalid commits and be done with it? I already suggested that the site update should be simplified, and now we have clear evidence that the current process of "site vs master" is prone to errors. Vladimir