Merge pull request #1861 from ilya-lavrenov:ocl_args_fix