fix resource path
Merge branch 'master' into protobuf_241