Merge "Fixed testcases using sampler uniforms" into devel/master