Merge branch 'shaderExecutor-descriptorSet' into 'master'