Fix "__constant" issue for all features
merged ocl constant fix changes
testing ocl fix for other features, works