Merge pull request #1635 from rainers/cv8_alignment