Merge pull request #1852 from ilya-lavrenov:ocl_retina