Merge pull request #7688 from alalek:fix_orb_test