Merge pull request #4781 from kumpera/unaligned-cleanup-1