Fixed merge issue
Merge pull request #550 from blackberry/next-xxy

Fixed merge issue