Prepare moving away from memmove() on incoming HS
4 files changed