[TW173] - evade
Merge remote-tracking branch 'upstream/master_revamp' into EpicCore3