Merge pull request #4818 from kumpera/unaligned-cleanup-2