more 2.1 rollback and progress on allowedContent in editor