Updating old hardcoded paths to conrefs.
Merge branch '3.4'