Applied pull request from CP for local resources