Hero Bait: fixed entcs removal
Merge branch 'unstable' into nadget-regen-revamp