Merge "Identify samplerExternalOES in sampler array" into tm-dev