Issue 5086 unable to edit content after push publish due to archived references

this pull also include a reference to the enterprise code